Migrate 25 crates to monorepo. sec1 semver serde_cbor serde_derive shared_library slab smallvec smccc socket2 spin spki strsim strum strum_macros sync_wrapper syn-mid synstructure tempfile termcolor termtree textwrap thiserror thread_local tinytemplate tokio-macros Bug: 339424309 Test: treehugger Change-Id: Ic6c263ad27826689004b7d8fc0e03552f81e0f22
diff --git a/Android.bp b/Android.bp index dca1937..96beb97 100644 --- a/Android.bp +++ b/Android.bp
@@ -1,82 +1 @@ -// This file is generated by cargo_embargo. -// Do not modify this file because the changes will be overridden on upgrade. - -package { - default_applicable_licenses: ["external_rust_crates_sec1_license"], -} - -license { - name: "external_rust_crates_sec1_license", - visibility: [":__subpackages__"], - license_kinds: ["SPDX-license-identifier-Apache-2.0"], - license_text: ["LICENSE"], -} - -rust_library { - name: "libsec1", - host_supported: true, - crate_name: "sec1", - cargo_env_compat: true, - cargo_pkg_version: "0.7.3", - crate_root: "src/lib.rs", - edition: "2021", - features: [ - "alloc", - "der", - "pkcs8", - "zeroize", - ], - rustlibs: [ - "libder", - "libpkcs8", - "libzeroize", - ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], - product_available: true, - vendor_available: true, - visibility: [ - "//packages/modules/Virtualization:__subpackages__", - "//system/keymint:__subpackages__", - ], - -} - -rust_library_rlib { - name: "libsec1_nostd", - crate_name: "sec1", - cargo_env_compat: true, - cargo_pkg_version: "0.7.3", - crate_root: "src/lib.rs", - edition: "2021", - features: [ - "alloc", - "der", - "pkcs8", - "zeroize", - ], - rustlibs: [ - "libder_nostd", - "libpkcs8_nostd", - "libzeroize_nostd", - ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - product_available: true, - vendor_available: true, - visibility: [ - "//packages/modules/Virtualization:__subpackages__", - "//system/keymint:__subpackages__", - ], - -} +// This crate has been migrated to external/rust/android-crates-io. diff --git a/cargo2android_viz.bp b/cargo2android_viz.bp deleted file mode 100644 index 8ce03b7..0000000 --- a/cargo2android_viz.bp +++ /dev/null
@@ -1,4 +0,0 @@ -visibility: [ - "//packages/modules/Virtualization:__subpackages__", - "//system/keymint:__subpackages__", -]
diff --git a/cargo_embargo.json b/cargo_embargo.json deleted file mode 100644 index 0d9e163..0000000 --- a/cargo_embargo.json +++ /dev/null
@@ -1,37 +0,0 @@ -{ - "apex_available": [ - "//apex_available:platform", - "com.android.virt" - ], - "features": [ - "alloc", - "der", - "pkcs8" - ], - "run_cargo": false, - "variants": [ - { - "package": { - "sec1": { - "add_module_block": "cargo2android_viz.bp" - } - } - }, - { - "module_name_overrides": { - "libder": "libder_nostd", - "libpkcs8": "libpkcs8_nostd", - "libsec1": "libsec1_nostd", - "libzeroize": "libzeroize_nostd" - }, - "package": { - "sec1": { - "add_module_block": "cargo2android_viz.bp", - "force_rlib": true, - "host_supported": false, - "no_std": true - } - } - } - ] -} 